From: Keir Fraser <keir.fraser@citrix.com>
Date: Fri, 26 Feb 2010 17:09:50 +0000 (+0000)
Subject: Revert 20954:b4041e7bbe1b "paging_domctl: Add missing breaks in switch stmt"
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~12555
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=b1c29c92ae99e9e95651c9ef8d1672cdc952cc7f;p=xen.git

Revert 20954:b4041e7bbe1b "paging_domctl: Add missing breaks in switch stmt"

This fixed a fairly innocuous bug (OP_ENABLE/OP_OFF both don't work
properly) but unmasked a much nastier one (turning off shadow mode on
a PV guest crashes the hypervisor).

So, for now, we pick the less of two evils. We don't really much rely
on OP_ENABLE/OP_OFF anyway, as it happens.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
---

diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c
index 6bc23848a0..e1a4716b21 100644
--- a/xen/arch/x86/mm/paging.c
+++ b/xen/arch/x86/mm/paging.c
@@ -714,13 +714,11 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc,
                 hap_logdirty_init(d);
             return paging_log_dirty_enable(d);
         }
-        break;
 
     case XEN_DOMCTL_SHADOW_OP_OFF:
         if ( paging_mode_log_dirty(d) )
             if ( (rc = paging_log_dirty_disable(d)) != 0 )
                 return rc;
-        break;
 
     case XEN_DOMCTL_SHADOW_OP_CLEAN:
     case XEN_DOMCTL_SHADOW_OP_PEEK: